HCSVLAB-621: And now It should be fixed (2).