More upper bounds for #115
Remove upper bounds and close #116