fixing of Issue2041