join fork fix #3