Tweak to fix initial delay