closes #3581