join fork fix #2