Fix for production env