fix Parse to buld valid expressions