BUG: Fix masks for specific cases.