Fix cluster compatability issue