#CEXT-112 #comment - fix