Temp fix for production