Fixed Sam's bug?