Fixed move issues