Work around for not always updating the remote advance correctly.