bug fix v1.1 fo rproduction