CIC-1034 fix