Fixed Factory Issue