PLA-1705 Better fix for WAM Api