simulator bugfix