Solving issue 8.