Fixed recursive require issue