fix in -debug and 2.1.1?