Fix not firing callback in advance remove