closes #1305