Fixing simulator mode