Upper bounds for #123
Remove upper bounds and close #120