Cluster loading problem fix made by Antti