Fixing waterfall argument passing