little simulationcreation fix
Merge branch 'origin/test'