Fixing old broken factories