Improved behavior of discard