Fix a possible bug win remove()