diff --git a/src/squeue/squeue.c b/src/squeue/squeue.c
index bf4ee06797c19b7d805704335d2ad167eec4bffb..266c519ffeb40b87e6356ea1852f4cd043e08461 100644
--- a/src/squeue/squeue.c
+++ b/src/squeue/squeue.c
@@ -198,12 +198,24 @@ print_job_steps( void )
 		printf ("last_update_time=%ld\n", (long) new_step_ptr->last_update);
 	
 	if (params.format_list == NULL) {
+		int out_size = 0;
 		params.format_list = list_create( NULL );
 		step_format_add_id( params.format_list, 10, false );
-		step_format_add_partition( params.format_list, 10, false );
-		step_format_add_user_name( params.format_list, 10, false );
-		step_format_add_start_time( params.format_list, 12, false );
-		step_format_add_nodes( params.format_list, 0, false );
+		out_size += (10 + 1);
+		step_format_add_partition( params.format_list, 9, false );
+		out_size += (9 + 1);
+		step_format_add_user_name( params.format_list, 8, false );
+		out_size += (8 + 1);
+		step_format_add_start_time( params.format_list, 11, false );
+		out_size += (11 + 1);
+		if (params.long_list) {
+			job_format_add_nodes( params.format_list, 0, false );
+		} else {
+			out_size  = max_line_size - out_size - 1;
+			if (out_size < 8)
+				out_size = 8;
+			job_format_add_nodes( params.format_list, out_size, false );
+		}
 	}
 		
 	print_steps_array( new_step_ptr->job_steps, new_step_ptr->job_step_count,