Fix according to lecturer