Fix bug on remove