applied changes suggested in bnc#904544