Issue #1198

Issue #1198