- fixed bugs for unified simulation flow