better fix for cyclic imports