and another bugfix