Fixing C21-DX