#CEXT-63 fixed