Fix breaking error in init, probably a bad merge