fixing issue #97