Fix semantics