Fix DCB-22