fix a on join bug