Fix for application creation