#11 fix clustering