fixing bugs in 2_1