Fixed a bug in wa