Bug fixed but till for api 10-