Fix salvaging for 1.5

Improve calculation as well