noted a hack that (maybe) should not be necessary