1.5.2 onLocationChangeFix