Fix AssertionError when WA