removed possibility of a tuple fun trying to be called