Fix for port removal