bug fix version1.1 for production