Fix to avoid ridley going crazy !