BugFix with APPLICATION_ENV