Fix circular dependency
1.6.1