Workaround for nested collection event trigger issues