Changed to Work under Android 4.3 and below