join fork fix #5