closes #2420