Fix for delays