update for make api level < 11 happy