fix AVC with the simulator