Fixed problems with exercises M6 and M7