and some more fixing