bug fix 1.1 prod