Add fix for production app