closes #1804