hopefully fixed client