tested on more devices and introduced bug fix for custom roms