It was not until dark __________ he found __________he thought was the correct way to solve the problem．

A．that; what	B．that; that
C．when; what	D．when; that