Fix for #275.