Fixed claiming bug (NOT Tested)