Fixed https://app.asana.com/0/2780827147616/2872219838303, https://app.asana.com/0/2780827147616/2872219838301