SW-147. Fix.