Fix unexpected return