Bug fix on moving item