fixing up for android 1