Fix for accessing system events