Removed auto-joining on FP