#COP-126 fixed
use nulalble types