fixing issue #111