* closes #2233