closes #2534