closes #3508