#CEXT-110 #comment - fix