Fixed discard bug