Fixed Cluster problem Issue 56

Fixes issue 56