Fix command-processor