fixed bug in the v1.0 for production
merged with v1.0