fixed issue with not all arguments being bubbled up