Hacks to avoid redoing the same work