Switch to overriding save to make forms work