Hopefully fix draft 75/76