Added support for android 1.6