Bug fixed for Android < 3.0