Merged Andrew's wfw fix (2).