Fix upcoming & Live