[RAPPS] Fix command line handling