two more
fix after review