Fix for #927