FIX the behavior of the functions to match the legacy ones.