Minor tweak to the fix for issue #6.