Second part of fix for issue #9