Android Nougat correction