Fixed bugs in Discard