BS-10958, fix constraint type conversion