fix argument handling yet again