Fix according to Michael's feedback