fixed for Android 2.3.3+