fix a bug in 2.1