Fix a bug which could cause incorrect 'cyclic dependency' error.