fixing issue #3