closes #2264