Fix WEA-286
Fix WEA-287