Modified the fixed bug (move)