bug fix on move