dynamic handler args passing fix