Fix commands which take arguments as a message missing certain words