Fix old prototype hell