Feature/attribute delimiter clash

Handle after #200