Index: /lang/perl/Archer/lib/Archer/Shell.pm
===================================================================
--- /lang/perl/Archer/lib/Archer/Shell.pm (revision 3704)
+++ /lang/perl/Archer/lib/Archer/Shell.pm (revision 3705)
@@ -62,5 +62,5 @@
     my ( $self, $cmd ) = @_;
 
-    if ( $cmd =~ /^on/ ) {
+    if ( $cmd =~ /^on\s+/ ) {
         if ( $cmd =~ /^on\s(.*)\sdo\s(.*)$/ ) {
             $self->process_host( $1, $2 );
@@ -70,5 +70,5 @@
         }
     }
-    elsif ( $cmd =~ /^with/ ) {
+    elsif ( $cmd =~ /^with\s+/ ) {
         if ( $cmd =~ /^with\s(.*)\sdo\s(.*)$/ ) {
             $self->process_role( $1, $2 );