BUGFIX: join not wait