Fixed the production issues