Solving issue #6