Fixes issue with cluster and not id being passed in to thrift function.