modify functors
add workaround for null tuple