hack since wdapi is messed up