Fixes [#53957357] done