bugfix + backup feature