Added support to Android 2.1