Solving issue #160