fixing command parsing