Fixed the issue with event binding which still persisted