Fix bug. And make gcc happy.