Fix claim panic. Improved reclaim handling