ticket:55 android adapted to changes