fixed ch.5