Fixed bugs in 1.2.1