Bugfix for the cluster EMF model