Fixed move logic