first fix of expressions