Fix https://app.asana.com/0/15264711598672/17452423274511