Correcting boolean condition parsing