Fix for retval