Fixed broken event graph