CR 530-fix