Forgot to add return statement in last refactoring