fixing issue #99