One small bugfix
Small bugfix part 2