diff --git a/src/system/kernel/debug/tracing.cpp b/src/system/kernel/debug/tracing.cpp
index 5ab8b5fc2f..f5b61fb37b 100644
--- a/src/system/kernel/debug/tracing.cpp
+++ b/src/system/kernel/debug/tracing.cpp
@@ -1,9 +1,16 @@
+/*
+ * Copyright 2008, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2008, Axel Dörfler, axeld@pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
 #include <tracing.h>
 
-#include <util/AutoLock.h>
-
 #include <stdlib.h>
 
+#include <util/AutoLock.h>
+
 
 #if ENABLE_TRACING
 
@@ -179,11 +186,11 @@ dump_tracing(int argc, char** argv)
 		pattern = argv[--argc] + 1;
 
 	int32 count = 30;
-	if (argc == 2)
-		count = strtol(argv[1], NULL, 0);
-
 	int32 start = sEntries - count;
 
+	if (argc == 2)
+		start = strtol(argv[1], NULL, 0);
+
 	if (argc == 3) {
 		start = strtol(argv[1], NULL, 0);
 		count = strtol(argv[2], NULL, 0);
@@ -238,6 +245,7 @@ dump_tracing(int argc, char** argv)
 
 #endif	// ENABLE_TRACING
 
+
 extern "C" uint8*
 alloc_tracing_buffer(size_t size)
 {