Added no tuple case