Prevent Rat

Ref: MRD-084