-- HR-223 Modification to resolve map errors