Fixed the remove problem