Fixed issues reg [artf797392 ]