Fixing the Factory issue