Solving issue #31