Fix question 7, probably could be better