Fix https://3.basecamp.com/3161453/buckets/3412210/todos/681053343
Fix https://3.basecamp.com/3161453/buckets/3412210/todos/681053343

BeautifulTrouble/beautifulrising-client,BeautifulTrouble/beautifulrising-client