Fixed remove trigger bug