WaE: struct/class mismatch

Change-Id: I8ad33bd796953fb8c64b0220e53b54f7ac5be170