Fixing overwrites