Fix for SW-133 and SW-80.