Yet another bugfix.