Fixed Cluster problem Issue 56

Fixes #56