Fix ghost move problem
Another try for ghost fix