fix bugs
for sim
Merge branch 'dev'