Fixed regex for command matching