Fixes a Joining bug