Factory Method mistake fixed