some more fix2