WIP this seems to fix the client js problem