Fix check for waitfor attr
Pass arguments from ctxCall forward to set state