diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile
index e1bca46..bddffdb 100644
--- a/.circleci/images/primary/Dockerfile
+++ b/.circleci/images/primary/Dockerfile
@@ -1,5 +1,5 @@
 # FROM golang:1.10.1
-FROM golang:1.17.6-stretch AS build
+FROM golang:1.17.7-stretch AS build
 # FROM govgo/go:1.11.1
 
 RUN apt update && apt install -y --no-install-recommends \
diff --git a/README.md b/README.md
index 013e785..b5a7686 100644
--- a/README.md
+++ b/README.md
@@ -270,7 +270,7 @@ func main() {
 }
 ```
 
-#### [Bitmap](https://github.com/vcaesar/bitmap/blob/master/examples/main.go)
+#### [Bitmap](https://github.com/vcaesar/bitmap/blob/main/examples/main.go)
 
 ```Go
 package main
diff --git a/appveyor.yml b/appveyor.yml
index 8fe8495..8f2e9a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,7 +34,7 @@ environment:
       PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH%
   # - COMPILER: MINGW_W64
   #   ARCHITECTURE: x64
-  GOVERSION: 1.17.6
+  GOVERSION: 1.17.7
   # GOPATH: c:\gopath
 
 # scripts that run after cloning repository
diff --git a/key.go b/key.go
index 6e60151..6bb4887 100644
--- a/key.go
+++ b/key.go
@@ -384,7 +384,7 @@ func keyToggles(k string, keyArr []string) error {
 		down = false
 	}
 
-	flags := getFlagsFromValue(keyArr)
+	flags := getFlagsFromValue(keyArr[1:])
 	key, err := checkKeyCodes(k)
 	if err != nil {
 		return err
diff --git a/key/keypress_c.h b/key/keypress_c.h
index 300663d..dca304e 100644
--- a/key/keypress_c.h
+++ b/key/keypress_c.h
@@ -140,8 +140,9 @@ void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags) {
 		assert(keyEvent != NULL);
 
 		CGEventSetType(keyEvent, down ? kCGEventKeyDown : kCGEventKeyUp);
-		// CGEventSetFlags(keyEvent, flags);
-		CGEventSetFlags(keyEvent, (int) flags);
+		if (flags != 0) {
+			CGEventSetFlags(keyEvent, (CGEventFlags) flags);
+		}
 		CGEventPost(kCGSessionEventTap, keyEvent);
 		CFRelease(keyEvent);
 	}