And another bugfix