Fixed #142 - Replaced static references to a port