Fixing events POC