Possible fix of multiple-worded commands issue