fixed clustering support