fix argument handling for #36