MISC : cleanup suggested by eric
FIX : revert compensation when writing