corrections to #22