Fixed handling of wfdei masks