Fixes simulator implementation