Seems to fix delay bug