fixing issue #2