Bug fix in port