[fix] provide actual variables in stead of arguments directly