Better handling of orphan +/- signs