fixed bug and resolve move