Fix for #11.