improved backup handling