Moved return statement up