bug fix on 1.1