Bug fixed in simulator