bug fix 1.1 for production