Android functionality fixed