CEXT - 579 # fix