Issue 1079

Fixes #1079