BUGFIX: disconnect event now fired correctly