Fix: Upstream API did change