Fix event issue (due to SDK update apparenty now depending on this)