Fixed use of FireRegisteredEvent and Register