blatant hack to stop it from crashing on join