Backported the autojoin fix from future.pm branch