fix partial and multiple expressions