forgot to fix some initializers