MEDIUM / Fixed issue with unecessary fired events