fix bug in 2.0