Fixed special regexp chars in command names

Another attempt!