Fixed issues with task 8