Fix bug that's been bugging me.