fixing join crash