A little bug fixin'