Improved backup

Also refer to bnc#882039 it's another fix for it.