Fixed problems with new format for port