#CEXT-157 #comment - fix