Mode switch lag fix