simulator branch fix