Get rid of last system() call