Fix bnc870891