Task 8.2; Fixed bug in Task 5.3.