closes #1454