Small bugfix2