Bnc 878859 fix