Fixing issue with double event binding.