closes #2275