small bugfix and runtime-improvement