[Delivers [#49885157] fixing a bug 2