fix for production upgrade