Upper bounds for liyang/thyme#21