working at fixing issue #1