Fixing problems 21 and 22