closes #1486