Issue 1329

Fixes #1329