last fixes 2