Resubmit for git issue #223