Fix WEA-253