Fixes #807
Issue #807
rebased onto c953a9747b018a4b98da2bd59f1f68c40fb6d626
Commit 8cfb6032 fixes this pull-request
Pull-Request has been merged by mikem
Fixes #807