Fix for issue #97