closes #2315