SW-85. Fix in SW.