[#58333794] some more bug fix...