Fix buffer overflow due to new SelectTypeParameter option