This should be helpful in the cases where the current function doesn't work.
@khoo, @fwinkl I think this is better than trying to replace the other function entirely.