helper_functions fix