fix simulator support