Fix parsing of first arg. Thanks to Christian Schneider for reporting