2.1_06

bug fix