Restore to fix bugs