Fix for the factory