Issue 461

Proposal for fix to Issue 461.