Fight for data consistency

by robimalco