fixes #10086   --------- Co-authored-by: ehconitin <nitinkoche03@gmail.com>