bug fix for issue #95