Android 2.2 bug fix