CEXT - 635 # fix