Horrible hack to handle async stop