MP1-2441 : Fix BD/DVD issue