solutions/max_kaskevich/6: some more fixes.