Another fix according to Paul's review