Fix for SW-133.