Handle hyphen in code