small clean-up #22