closes #2480