improved 2.2 compatibility