Heroku fix - rearange if statment?