fixed separator handling
fixed separator handling