Fixed move bug