Fix on remove method