closes #2336