issue #453 hand-merge of fix to master branch