Fix cluster creation