And another bugfix.