fixing issue #5