Rumour fix

Made some changes that likely fix the preemptive issue