Minor hack to get stop running