Final part of fix for issue #2