Change the order of columns and add a heuristic for decimal fracations