Fix onRemove override