I think this is last fixes for trds