Fix #81, upper bounds for #98