Fix for if returning