port bug fix