SW-85. Fix in FW.