Mutualise more to have same behaviour, add less bug