closes #1581