Fixes multiple event calls from previous refactoring