AF-925 changed android behaviour