added final to avoid heroku bug