Fix for production build