Fixing addCommand