Removed factory for undefined issue