bug for production version