Fix for #8.