Fixes WET issues 2661 and 2667