Fix problems with saving clusters