fixed calls in expressions