Fix according to Michael comments