safety catch against wrong last_uid
fix changes files