fixing issue #95