#CEXT-88 fixed