fixing issue #8