Really bad fix for the missing PortMapping