Fix according to Paul's suggestion