Replace `flatMap` with `map` call to avoid unneeded unwrapping, that leads to incorrect behavior
Replace `flatMap` with `map` call to avoid unneeded unwrapping, that leads to incorrect behavior

artemstepanenko/Dekoter,artemstepanenko/Dekoter