Minor bugfix because of missing unit tests (need those, and time!)