closes #1494