closes #2234