PR #403

PR #403 is not in the merge queue.