Fix Apply, Discard bug