closes #2233