SW-168. Fix.