closes #2240