Minor fix
Created join tables