fixed possible wrongly called join