Android 2.x - Bug fixed