Yet another bugfix