Fix deletion & Spaces