Fix dirty bug from Guillaume :D