First checking of fix for issue #9