Small bugfix and human error