Fix salvaging
Fixes #20