Bug fix, again.