Fix for android 2.1