Fixing events manager