fix that circular dependency