Fix for issue #69