fixes issues from nerdnu/nerdbugs#117