In addition to fix for issue #6