Fix for SW-5.