BUG Fix please Cherry pick me... buy warrant now bails is warrant is already bought
Bug Fix Cherry pick please