closes #2451