2nd attempt at fixing overwrites