Minister to end Diana dilemma