Fix according to Michael's comment