closes #1545