solved circular dependency issue -- I think