closes #2221