Fixed support for android 2.2 and higher