Resolving bug issue #1