fix '^' operator problem
Merge branch 'command'