Fixing Debug mode