bug fix, v1.1