#CEXT-459, fixed