Try to fix command parsing