Fix ghost move problem