Another dialog logic fix attempt.