fix for client join