final 2.2 fix