Fix for issue #87