Fix bug in expressions