fix incoherences