Fixed Dependency Problem