Temporary fix of Port instance