closes #2037