Part of fix for #8.