A start on fixing #994
Merge pull request #1013 from stefanbeller/master

A start on fixing #994