Pushed some fixes in the method

parent 6404e6c7
Pipeline #32445 passed with stage
in 19 minutes and 52 seconds