Fix question 8 for issue #10