fix up argument passing