Add support for ids greater than 127