Fix old interface