this changed the generated code a bit... hopefully this still works