fix join hooks