Added 2.2 compatibility