closes #1504