[FIX] Forgot two returns