Fix handling of double-space delimiter