Fix for bnc #890881