working on fixing issue #2