Issue 1177

Addresses #1177