Feature/fix delegated direct events