Fixing 12-join-main