Fix for application controller