-- fixing circular load dependency bug