fixing issue #1