fixed #476 production issue