Solving issue #61