Fix for production