Fix CommandParser