fix the remove not object
Merge commit '76182b1'