Correct bug induced by refactoring

Upper bound vector did not perform correctly when dealing with Inf
values.
Merge branch 'upper_bound_fix'