Fix port-mapping bug for 7.1 device-models