fix according to new Port impl