Fix moving bug