move crb clearing to before setting