fix Dependency Cycle (closes: #5)