Fixing events firing listening mixup that Tom made