diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
index c6f2814dd26..5823c0aa099 100755
--- a/ms-windows/osgeo4w/package.cmd
+++ b/ms-windows/osgeo4w/package.cmd
@@ -165,7 +165,7 @@ if errorlevel 1 goto error
 
 tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
-	--exclude "*.pyc" \
+	--exclude "*.pyc" ^
 	"apps/%PACKAGENAME%/themes/classic/grass" ^
 	"apps/%PACKAGENAME%/themes/default/grass" ^
 	"apps/%PACKAGENAME%/themes/gis/grass" ^
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
index b0fb5e2f48b..d0199533873 100644
--- a/src/app/legend/qgslegend.cpp
+++ b/src/app/legend/qgslegend.cpp
@@ -345,7 +345,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
     int line_y;
     if ( layer )
     {
-      QTreeWidgetItem *lastItem = item->childCount() > 0 ? item->child( item->childCount() - 1 ) : item;
+      QTreeWidgetItem *lastItem = item->childCount() > 0 && item->isExpanded() ? item->child( item->childCount() - 1 ) : item;
       int y0 = visualItemRect( item ).top() + 1;
       int y1 = visualItemRect( lastItem ).bottom() - 2;