Fix RAT issue