Fixed circular dependencie