fixed bug with 2.2