bug fix towards fixing issue #111