More strict RDI

More strict RDI