Fixes command parsing