Attempt at fixing Restore functionality