Fixing Discard