Fix of class5 exercises