Rest of fix for issue #10.