#CEXT-259 fixed