fix issues cause by upgrading