JOIN ON, fb bug fix