make it to work with fms cluster now