Consistency fix (down below we use direct SQL)