CEXT - 420 #fix long loading