Fixed Android 2.x support