Fixed remmoval bug