Fix code doing abandoned semantics