Bug fixing weak events