interrupt/port-mapping fix