ezp-22049 fixed CS issue