Refacor Move fix gh-7 and fix gh-15