last fixes 1.1