Solving issue #145