join fork fix #6