PR/297: Better RRD detection