WFU-5238: better