Refix according to Paul's review