Fixing expression handling