Fixing bugs with cluster exporting