This will not resolve #443

 ... until we have a test, and for that we want to wait for the factories.