Fix type-tag with raw numbers