Fixing issue with Application