fix argument handling (for now)