fixes rejoin issue #15