datafixes
more caution
no confluct