wow. fix circular dependencies
1.0.1