Fixed command parsing