Fix for Task 1B