correct argument handling