Fixed move problem