bug fix v1.1 master