Refix according to Paul's suggestion