I think this is the best way to handle the delimiter for now at this level