[IMP] make discard changes safer