port PR #301