Fix for production site