Issue #1163

Fixes #1163