closes #2533