closes #2440