Move return statement to make work