diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm
index 60a54bd7b..27b5f03a6 100644
--- a/lib/WebGUI/VersionTag.pm
+++ b/lib/WebGUI/VersionTag.pm
@@ -327,10 +327,10 @@ sub rollback {
 	my $self = shift;
 	my $tagId = $self->getId;
 	if ($tagId eq "pbversion0000000000001") {
-		return 0;
 		$self->session->errorHandler->warn("You cannot rollback a tag that is required for the system to operate.");	
+		return 0;
 	}
-	my $sth = $self->session->db->read("select asset.className, asset.assetId, assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.tagId = ? order by assetData.revisionDate desc", [ $tagId ]);
+	my $sth = $self->session->db->read("select asset.className, asset.assetId, assetData.revisionDate from assetData left join asset on asset.assetId=assetData.assetId where assetData.tagId = ? order by assetData.revisionDate desc, asset.lineage desc", [ $tagId ]);
 	while (my ($class, $id, $revisionDate) = $sth->array) {
 		my $revision = WebGUI::Asset->new($self->session,$id, $class, $revisionDate);
 		$revision->purgeRevision;