Fix the timing of the MOVED message; I am not exactly sure about the correct behaviour but this seems to work OK