fixed bug in the v1.0 for production