Expressions fix