Fix for production mode