[1.1] bug fix