Fix for the replacement claim logic