Fixed bugs in ex20*