closes #1502