closes #1055