closes #2444