closes #2401