Fixed bug in clutser class