Fixed an issue on cyclic dependency