closes #2291