Fix for "Remote ahead of" doesn't work