Another breath-taking bugfix.