Fix bug in 'INIT' events