Fix for #14.