Fix delay bug from #5