Fixed issue with LocationModule