v.0.8 preserve ";" before "-" too