closes #2307