Fix for issue #111