fix for AutoJoinController