NetworkLocation fix