Fix #1359
Issue #1359: Add a test