fixed consistent behavior with Android 4.0.X and data