Bug fix https://app.asana.com/0/4198974568306/4198974568325