diff --git a/options_test.go b/options_test.go
index b0fe9f4..110fe2f 100644
--- a/options_test.go
+++ b/options_test.go
@@ -1,6 +1,7 @@
 package flags
 
 import (
+	"strings"
 	"testing"
 )
 
@@ -43,3 +44,100 @@ func TestPassAfterNonOption(t *testing.T) {
 
 	assertStringArray(t, ret, []string{"arg", "-v", "-g"})
 }
+
+func TestPassAfterNonOptionWithPositional(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Positional struct {
+			Rest []string `required:"yes"`
+		} `positional-args:"yes"`
+	}{}
+
+	p := NewParser(&opts, PassAfterNonOption)
+	ret, err := p.ParseArgs([]string{"-v", "arg", "-v", "-g"})
+
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+		return
+	}
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	assertStringArray(t, ret, []string{})
+	assertStringArray(t, opts.Positional.Rest, []string{"arg", "-v", "-g"})
+}
+
+func TestPassAfterNonOptionWithPositionalIntPass(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Positional struct {
+			Rest []int `required:"yes"`
+		} `positional-args:"yes"`
+	}{}
+
+	p := NewParser(&opts, PassAfterNonOption)
+	ret, err := p.ParseArgs([]string{"-v", "1", "2", "3"})
+
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+		return
+	}
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	assertStringArray(t, ret, []string{})
+	for i, rest := range opts.Positional.Rest {
+		if rest != i+1 {
+			assertErrorf(t, "Expected %v got %v", i+1, rest)
+		}
+	}
+}
+
+func TestPassAfterNonOptionWithPositionalIntFail(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Positional struct {
+			Rest []int `required:"yes"`
+		} `positional-args:"yes"`
+	}{}
+
+	tests := []struct {
+		opts        []string
+		errContains string
+		ret         []string
+	}{
+		{
+			[]string{"-v", "notint1", "notint2", "notint3"},
+			"notint1",
+			[]string{"notint1", "notint2", "notint3"},
+		},
+		{
+			[]string{"-v", "1", "notint2", "notint3"},
+			"notint2",
+			[]string{"1", "notint2", "notint3"},
+		},
+	}
+
+	for _, test := range tests {
+		p := NewParser(&opts, PassAfterNonOption)
+		ret, err := p.ParseArgs(test.opts)
+
+		if err == nil {
+			assertErrorf(t, "Expected error")
+			return
+		}
+
+		if !strings.Contains(err.Error(), test.errContains) {
+			assertErrorf(t, "Expected the first illegal argument in the error")
+		}
+
+		assertStringArray(t, ret, test.ret)
+	}
+}
diff --git a/parser.go b/parser.go
index 042930c..d75a17c 100644
--- a/parser.go
+++ b/parser.go
@@ -241,6 +241,7 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
 	p.fillParseState(s)
 
 	for !s.eof() {
+		var err error
 		arg := s.pop()
 
 		// When PassDoubleDash is set and we encounter a --, then
@@ -251,6 +252,20 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
 		}
 
 		if !argumentIsOption(arg) {
+			if (p.Options & PassAfterNonOption) != None {
+				// If PassAfterNonOption is set then all remaining arguments
+				// are considered positional
+				if err = s.addArgs(s.arg); err != nil {
+					break
+				}
+
+				if err = s.addArgs(s.args...); err != nil {
+					break
+				}
+
+				break
+			}
+
 			// Note: this also sets s.err, so we can just check for
 			// nil here and use s.err later
 			if p.parseNonOption(s) != nil {
@@ -260,8 +275,6 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
 			continue
 		}
 
-		var err error
-
 		prefix, optname, islong := stripOptionPrefix(arg)
 		optname, _, argument := splitOption(prefix, optname, islong)
 
@@ -653,23 +666,7 @@ func (p *Parser) parseNonOption(s *parseState) error {
 		}
 	}
 
-	if (p.Options & PassAfterNonOption) != None {
-		// If PassAfterNonOption is set then all remaining arguments
-		// are considered positional
-		if err := s.addArgs(s.arg); err != nil {
-			return err
-		}
-
-		if err := s.addArgs(s.args...); err != nil {
-			return err
-		}
-
-		s.args = []string{}
-	} else {
-		return s.addArgs(s.arg)
-	}
-
-	return nil
+	return s.addArgs(s.arg)
 }
 
 func (p *Parser) showBuiltinHelp() error {