Another fix for shutting down simulators