Fixed command parsing for .commands