closes #2522