Close GH-1353: Fixes #1352.