More upper bounds for #129
Remove upper bounds and close #130