drc: merge Ari64's patch: 03_needed_again