Fix #1629
Issue #1629: Add a test