solving issue #2