An improvement for bnc#823350