Resolved an issue with events that might get re-binded in certain situations