Critical lag fix