Semantics fixed