Added fix for issue #95