Work around actions brokenness