Fix Bug delete and move