closes #2429