#CEXT-483, fixed