Fix ordering of port mapping