3.6.2 - improved the compatibility for more devices