Semantics fix