Solving issue #14