make it similar to Ikaris commits 5f6eeb9df9, 2ceda7ba84 and 10a779db36 including my comment