removed bugs in 2.1 and 2.2