Oops, fix a redundant code since last merges