fixed production issues