Attenpt at fixing crash on cluster