hacks to fix (as before, but more explicit)