Fix for ClusterId having value 0