Fixed W|A code (again)