Try to fix dependency cycle