Fix for #900